projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6fcfeab)
Remove conflict marker.
authorAndreas Schwab <schwab@suse.de>
Thu, 18 Jul 2002 09:42:56 +0000 (09:42 +0000)
committerAndreas Schwab <schwab@suse.de>
Thu, 18 Jul 2002 09:42:56 +0000 (09:42 +0000)
lisp/ChangeLog patch | blob | history

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 50f31ed41d0734a292f60202851ea17a67a752d1..0e59d51062a40786b3852b76953a35fba0d3c74e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -83,7 +83,6 @@
        * international/utf-8-subst.el: Populate utf-8-subst-rev-table.
        (utf-8-subst-table): Don't set.
 
->>>>>>> 1.4125
 2002-07-17  Kenichi Handa  <handa@etl.go.jp>
 
        * international/mule.el (define-coding-system-alias):
Unnamed repository; edit this file 'description' to name the repository.